From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 31 Jul 2023 15:11:21 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~14^2~18^2~4853
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f56034ca3c6626af331279caf347c6bedbab9ee8;p=emacs.git

Merge from origin/emacs-29

c692bbc6596 Revert "Improve commentary in nsfns.m"
bb885928d73 Fix NetBSD build --with-sound
39873d6d5d1 Fix typo in pre-filter for underline property
---

f56034ca3c6626af331279caf347c6bedbab9ee8